Merge branch 'master' of github.com:SiriDB/siridb-server
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 20 Jul 2018 07:40:09 +0000 (09:40 +0200)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 20 Jul 2018 07:40:09 +0000 (09:40 +0200)

Trivial merge